Auto merge of #2104 - mbrubeck:test-doc, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 2 Nov 2015 21:01:58 +0000 (21:01 +0000)
committerbors <bors@rust-lang.org>
Mon, 2 Nov 2015 21:01:58 +0000 (21:01 +0000)
None


Trivial merge